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

Change-Id: Ibbc0e7f21d0f038ee3a7b690bcbbcb9f88b7e831