Merge "Add more methods to dumpstate listener"
am: 601fe6c886

Change-Id: Ida8bdb340d22e390d1317de9ca9203e43cec6208