[automerger skipped] Merge "Empty merge of...

[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: bf7c0530 -s ours

am skip reason: Merged-In I8529b4cb63db58a5d4bc78e0216f36bcee02fad5 with SHA-1 ad9dc515 is already in history

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



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