[automerger skipped] Merge "Enable clang-format for frameworks/base" am:...

[automerger skipped] Merge "Enable clang-format for frameworks/base" am: 8857e6b6 am: 3a3a21f9 -s ours

am skip reason: Change-Id I08b8c6d1bae7d1954847c207ef8e6d80373b2d05 with SHA-1 a3117ca4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1366076

Change-Id: Id4c1132e05c004d72c3260d2e9d64616049a4419