[automerger skipped] Merge "[BP CLEANUP] Format bpfmt -s conflict 2/2" am:...

[automerger skipped] Merge "[BP CLEANUP] Format bpfmt -s conflict 2/2" am: 70bee993 am: 1e0d046f am: b6cea5a9 -s ours am: 29d35b9f -s ours am: 6cb243bf -s ours

am skip reason: Merged-In Iae5fe93b721528af57578009c117e8e5ae3becbe with SHA-1 0b374c26 is already in history

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



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