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

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

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