[automerger skipped] Merge "BluetoothMetrics: Add fallback solution for device...

[automerger skipped] Merge "BluetoothMetrics: Add fallback solution for device names" into tm-qpr-dev am: 867b494f -s ours am: 5b186b15 -s ours am: 2cbc329a -s ours

am skip reason: Merged-In If7d8aa463decc99cf95437d7a608ed2612323560 with SHA-1 41d98ac1 is already in history

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



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