[ Merge of http://go/wvgerrit/88006 ] Certain test files have yet to be formatted since we introduced clang-formatting. Test: android unit/integration tests Bug: 134365840 Change-Id: I2d30ad367d76a9dfbf389614e1b31ed39fa17c72