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