Merge "[DO NOT MERGE] Fixes CompanionDeviceManagerTest" into rvc-qpr-dev am: f05bfa9149
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13163630 Change-Id: Iebc3ba4e68f9a26f361b1adbc914658f746f773d
This commit is contained in: