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

[automerger skipped] Merge "[BP CLEANUP] Format bpfmt -s conflict 1/2" am: d8df5286 am: 78ac6904 -s ours am: e01d4661 -s ours am: 20a049f9 -s ours am: dfaafa0b -s ours

am skip reason: Merged-In I0ddc4496ed6fbf785613841eb85a71a4f2a92425 with SHA-1 ebd90ead is already in history

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



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