[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: 49ab6c45 am: 93583a80 -s ours am: 273373e4 -s ours

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

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

Change-Id: If655dc8f3182f068b6014984f3df5cfbdc451a85