[automerger skipped] Merge "BluetoothMetrics: Upload local supported features"...

[automerger skipped] Merge "BluetoothMetrics: Upload local supported features" into tm-qpr-dev am: 7c034ae9 -s ours

am skip reason: Merged-In I15c69aa17e59a2baababd4b9d150ee1985d87da9 with SHA-1 95a8b9a5 is already in history

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



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