Merge "clang-format: Double-indent continuation lines" am: 9be5f2df0a
am: 3d1b54b24d

Change-Id: If21766b53fcb1e126afb3c7449233a09f6a10d16