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

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

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