Merge changes from topic "am-ba066081bdff4f40b026187b5f7614f5" into...

Merge changes from topic "am-ba066081bdff4f40b026187b5f7614f5" into tm-d1-dev-plus-aosp am: 33d217d9 -s ours

am skip reason: Merged-In I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a with SHA-1 476f0434 is already in history

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



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