Merge "Merge "Align clang-format with the Checkstyle hook for short functions." am: 68a7e2a9 am: f622ebe7" into tm-qpr-dev-plus-aosp am: 1942925d

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



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