Merge "Revert "Simplify MediaSessionRecord callback invocations"" into main am: 84ebcbd07c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3048543

Change-Id: I9a0dc661e39dd4d65f7b0d1e33a190b68b9d0232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>