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

Change-Id: I5fdce9656081a221cfeac8897c44c8fd54498e8c