[automerger skipped] Merge "Revert "Revert "[BluetoothMetrics] This covers the case for Direct LE-AC...""" am: 7bce0057 am: f7e45d5c am: 57ba54b7 am: 21b52985 am: 5b31af55 -s ours

am skip reason: skipped by user wescande

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



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