Merge "Implement dumpsys for...

Merge "Implement dumpsys for CompanionDeviceManagerService.CompanionDeviceManagerImpl" into tm-dev am: 99945d5d am: 655a9295

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



Change-Id: I3b7e8c9189f25e66834a50a06725f2c71d817541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>