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

Change-Id: Idbf64e9fb70f39ae547ab3283ca6eb03b95db32d