[automerger skipped] Merge "BluetoothMetrics: Upload GATT server and client...

[automerger skipped] Merge "BluetoothMetrics: Upload GATT server and client connection state change events" into tm-dev am: aaa3fcb7 -s ours am: c9e90c18 -s ours am: 86c249fc -s ours

am skip reason: Merged-In If0fc3f489c0abffb1bf7d2ef87a6c554d45ebbbf with SHA-1 db0e3a4a is already in history

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



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