Merge "[BP CLEANUP] Format bpfmt -s in android,tools" am: ef7aeb21 am:...

Merge "[BP CLEANUP] Format bpfmt -s in android,tools" am: ef7aeb21 am: 1615e21e am: dbedea71 am: 1e411bc7

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



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