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: I2f6dbc6cf8ee18e6b7234b2ed73f227189e4b9f6