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

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

Change-Id: I8c0f48dd744a91fb33373edbeed573688eab355e