Merge "Remove UserId from UID when checking against BLUETOOTH_UID" am: 64ac247056 am: e2a68b9829

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

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