Merge "[BP CLEANUP] Format bpfmt -s in system/*" am: 6f2f31c3 am: b491e12d am: 57891e59

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



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