[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 05e6780f -s ours am: bccdbdc7 -s ours am: f5836db1 -s ours am: b3c5d49b -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: I5fd5e5c9dfd986032f901a63ee5849cb72913b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>