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

Change-Id: Idddcd5beda979a1ecf58fead5bfcc6e0e8959837