[automerger skipped] Merge "Changing params for...

[automerger skipped] Merge "Changing params for SendBroadcastMultiplePermissions" am: f00cdfe1 am: f461f594 -s ours am: 46abe216 -s ours

am skip reason: Merged-In I3fcb188ddcd7652c2596149be44a6a42373a43fa with SHA-1 c6ffc79a is already in history

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



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