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

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

Change-Id: Ibb667d61f3e13b5af163f558a881930f679d8fe3