Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac
am: fccf3bc0cf

Change-Id: Ia081fa95df4fb5eebf17d984cd012f6bbde12e40