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

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

Change-Id: I247f6ca30aaaa450450f9faaf6772da740e18151