Merge "Remove obsolete methods from DumpstateListener implementations" am: cbdb10f9 am: b745860a am: 82446aa5 am: d2412826 Change-Id: I92e578ef4fe85823e4d6f6d3bb4005e2180ad408