Merge "BluetoothMetrics: Upload local supported features" am: 9da0c31a am:...

Merge "BluetoothMetrics: Upload local supported features" am: 9da0c31a am: a37fe07e am: 0d789e96

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



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