[automerger skipped] Merge "[BluetoothMetrics] Adding dependent changes for...

[automerger skipped] Merge "[BluetoothMetrics] Adding dependent changes for direct LE-ACL L2CAP fixed channel" into tm-qpr-dev am: b9a19014 -s ours am: ed1a3c73 -s ours

am skip reason: Merged-In Ie40ce994abe8bb6023cf039fc3716ac0f35b11c1 with SHA-1 4588aad6 is already in history

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



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