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

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

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