Merge "Revert^2 "Simplify MediaSessionRecord callback invocations"" into main am: bf62098c10 am: fcdb4f3a7f

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

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