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