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