[automerger skipped] Merge "Update caller check to support multiple users in...

[automerger skipped] Merge "Update caller check to support multiple users in bluetooth utils" am: 02d5e3db am: 91712385 -s ours am: 5bdd4a63 -s ours

am skip reason: Change-Id I21bef7f38056e80da3212cfae24280473edb5445 with SHA-1 d15c53b8 is in history

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

Change-Id: If655dc8f3182f068b6014984f3df5cfbdc451a85