Merge "Minor style fixes for IDumpstateDevice@1.1 VTS test"