[automerger skipped] Merge "clang-format ManifestFixer_test.cpp" am: 171c9cdc6a am: 0b7bfe4c3f
am: 5f34ef1c3d -s ours
am skip reason: change_id I10b27abb8fa8a99a41976c42c4d684b99978b4f9 with SHA1 704090e02a is in history

Change-Id: I44781846a7451d4b0353c6c7cbaa36934c87da17