Merge "[Bugfix][Media] Fix ISessionControllerCallback leaks in the system_server when the far side died" am: 04eeb94b79 am: b882a036a2

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

Change-Id: Ib2232d4a8bfd571a6c6f4fc6b4a4a9f8d15a45f0