Merge "Merge "Don't notify dead client about losing control" into rvc-dev am:...

Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd48593 am: d68ed299 am: c1ee7c18" into rvc-qpr-dev-plus-aosp am: d49d9547

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

Change-Id: I78396a943909cce2cd0e1cc4b6f2220317e89f68