[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.013" into...

[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master am: 090051ec -s ours am: 12824e90 -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: Ibc4e578cb45c35f1dcc6e4e3b10a3767452391d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>