[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 05e6780f -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 05e6780f -s ours am: bccdbdc7 -s ours

am skip reason: Merged-In I66c0a83554d81f8a6a6956ec0a8a324be6b11033 with SHA-1 a82b0872 is already in history

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



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