[automerger skipped] Merge "[DO NOT MERGE] Fixes CompanionDeviceManagerTest"...

[automerger skipped] Merge "[DO NOT MERGE] Fixes CompanionDeviceManagerTest" into rvc-qpr-dev am: f05bfa91 am: f70d1fc7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I67f5fa9949878410d0124deb7105558738a9e4fd