[automerger skipped] Merge "Pretty print profile names in BluetoothDatabase"...

[automerger skipped] Merge "Pretty print profile names in BluetoothDatabase" am: 2aaf6a24 am: 6fc55e39 am: c7ae2a97 -s ours am: 22bebf97 -s ours am: 7c643a7e -s ours am: b8e352df -s ours

am skip reason: Merged-In Iec184020ff8778cb9c626b354c89fd8a7ef416de with SHA-1 da43e675 is already in history

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



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