[automerger skipped] Merge "Revert^2 "[Metrics] Cast the parameter for...

[automerger skipped] Merge "Revert^2 "[Metrics] Cast the parameter for avoiding ambiguity in a..."" into main am: 3394c7db am: 0d4819a5 am: e2a04184 -s ours

am skip reason: Merged-In I6a0dc742a2ced2d5fc5c5fca0c941271f4781fb3 with SHA-1 24cc661a is already in history. Merged-In was found from reverted change.

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

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



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