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

Merge changes from topic "am-e9df03c813a84fd89c2104a0334cc2af" into tm-d1-dev-plus-aosp am: 4e11ead8 -s ours

am skip reason: Merged-In I10c1fc206b7bdf7bf97e80bf1bc579e936021f37 with SHA-1 6a4e7f28 is already in history

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



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