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

Change-Id: Idd72ca09a0256c3e1283fd0c9d73a29939de4778