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

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

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