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

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

Change-Id: I95ff8acf09b3d5e51018ba890ca1716a9aa2a42d