Merge "Remove obsolete methods from DumpstateListener implementations" am: cbdb10f982 am: b745860a3e am: 82446aa5b6
am: d24128264f

Change-Id: I92e578ef4fe85823e4d6f6d3bb4005e2180ad408