Merge changes from topic "am-122ce106ff4a49fc918d508d7aa0f89e" into...

Merge changes from topic "am-122ce106ff4a49fc918d508d7aa0f89e" into tm-d1-dev-plus-aosp am: febde536 -s ours

am skip reason: Merged-In I919aa8e2a53f5b6f474ead764be9e24e02fcd9ea with SHA-1 39a3ecfe is already in history

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



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