[automerger skipped] Merge "Make IDumpstateDevice 1.1" am: 99ad09b7e7 am: e067d70f96 am: e673d59939 -s ours
am skip reason: Change-Id I5420e5e4ce88619c7e40cf967382f98babc3c3d5 with SHA-1 c9e2c6d319 is in history

Change-Id: I449cbbbae2faf268d0349af05a509559419ea126