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