Merge "clang-format: Adjust short functions / if settings."
am: d6a5005fcb

Change-Id: I2d8d58e4361207656e883cf21116eef9f35bf521