Merge "Minor style fixes for IDumpstateDevice@1.1 VTS test" am: 60cbc45573 am: 3d1ccc2f53 am: bb79986c4b

Change-Id: Ib96be557aecbe777fc7b5d0f8334d8787865fbb2