Merge "BluetoothMetrics: Reorganize transport resolution logging" into main...

Merge "BluetoothMetrics: Reorganize transport resolution logging" into main am: 1738e4fa am: 318fb344

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



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