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

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

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