Merge "[BP CLEANUP] Format bpfmt -s conflict 2/2" into udc-dev am: 5401c0c5

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



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