[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 am: 04156014 am: 363ae7f4 -s ours

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

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



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