Merge "Revert "Revert "[BluetoothMetrics] This covers the case for Direct...

Merge "Revert "Revert "[BluetoothMetrics] This covers the case for Direct LE-AC...""" am: 7bce0057 am: f7e45d5c

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



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