Merge "Revert "[Metrics] Cast the parameter for avoiding ambiguity in a...""...

Merge "Revert "[Metrics] Cast the parameter for avoiding ambiguity in a..."" into main am: 257a1641

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



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