Merge "Do not use intent for counter metrics" am: 3ef291c3 am: 2424267d

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



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