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

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

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



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