Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a
am: 01afbb8f29

Change-Id: I60bd86901647ada3debee5ec4314c2b8287afefb