[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master am: 090051ec -s ours am: 12824e90 -s ours am: 3ea26b0f -s ours am: b2648727 -s ours

am skip reason: subject contains skip directive

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



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