Merge changes from topic "bt-foreground-user-id-revert" into tm-dev am: 8fab608e am: 155ed35b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17762035



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