[DO NOT MERGE] Fixes CompanionDeviceManagerTest am: 96e2d98c5c

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

Change-Id: Id52fefe163964562351d1dac879f97f75c5b6c4d