[automerger skipped] Merge "Add test for AdapterService.dump()" into...

[automerger skipped] Merge "Add test for AdapterService.dump()" into tm-qpr-dev am: 16aba87f am: 0d2c7bcf -s ours

am skip reason: Merged-In I0da8f9aa8004f2f511666ec39cbb2a7d220840bf with SHA-1 81101987 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20629062



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