[automerger skipped] Merge "Implement dumpsys for...

[automerger skipped] Merge "Implement dumpsys for CompanionDeviceManagerService.CompanionDeviceManagerImpl" into tm-dev am: 99945d5d am: 655a9295 -s ours

am skip reason: Merged-In I8488d23867a66432ca6750bb78ab00229939b5f5 with SHA-1 8d06d27b is already in history

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



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