Merge "Change Column number of clang format for gd" am: 91a1fc97 am: 6b8042d6 am: d238207d

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



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