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

[automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into stage-aosp-master am: 9c6f4c28 -s ours am: 154497cf -s ours am: 6ca722fa -s ours am: f8cbf20b -s ours

am skip reason: subject contains skip directive

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



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