[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-ba066081bdff4f40b026187b5f7614f5" into tm-d1-dev-plus-aosp am: 33d217d9 -s ours am: dbff4760 -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: I6f0ad93a3cb9bf2640caebf09a9f79acf9a7b0b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>