[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 63f325c7 -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 63f325c7 -s ours am: 75882aad -s ours am: 45e9aacd -s ours am: a1689d80 -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: I32c04409048dbc9893c22688a0160a1a5b559e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>