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

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



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