[automerger skipped] [DO NOT MERGE] Fixes CompanionDeviceManagerTest am: 96e2d98c5c am: 3a1c2bded9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib7874f0879466ecf7f485862fd6d05b090ebec2b
This commit is contained in:
Antonio Kantek
2020-12-04 17:33:25 +00:00
committed by Automerger Merge Worker

Diff Content Not Available