Merge "Merge "Merge "Don't notify dead client about losing control" into...

Merge "Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd48593 am: d68ed299" into rvc-d1-dev-plus-aosp am: 4bf3b5c7" into rvc-qpr-dev-plus-aosp am: 4eca1924

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

Change-Id: I53e558862d2ff9c7b43fe961646cab9521996c5f