Merge "Simplify MediaSessionRecord callback invocations" into main am: b92cea9bda

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

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