Merge "Fix ConnectedDeviceVoiceRecognitoinNotifierTest" into rvc-qpr-dev am: ff1cbcc780 am: 71e762fa31

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988442

Change-Id: Ia859c8d82bc5edba1751bcbc7445260f8288c433