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