[automerger skipped] DO NOT MERGE am: 6d6f28c5 am: 3a3c016d am: a03bb8f9...

[automerger skipped] DO NOT MERGE am: 6d6f28c5 am: 3a3c016d am: a03bb8f9 am: e7d21ea1 -s ours

am skip reason: subject contains skip directive

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



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