Merge "Merge "Don't notify dead client about losing control" into rvc-dev am: edd48593 am: d68ed299 am: c1ee7c18" into rvc-qpr-dev-plus-aosp