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

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

Change-Id: I5d87f1e87308ca9dfc130314bc0907db8d432298