[automerger skipped] Merge "Remove obsolete methods from DumpstateListener implementations" am: cbdb10f982 am: b745860a3e am: 82446aa5b6 am: d24128264f
am: 6c1f4b2dc2 -s ours
am skip reason: change_id I40d654a70bd9ceb3a29f8a0113b85616100f4ee9 with SHA1 56659ae22f is in history

Change-Id: Ibd8edbdc27287b31580fe4c5aaf19e09d79b2001