[automerger skipped] Merge "Fix file paths for DumpstateUtil calls in 1.0" into rvc-dev am: 3b491b4812 am: a30b3562ba am: 691cdcd66f am: 715ac38dc9 -s ours am: 19fbdf971d -s ours

am skip reason: Change-Id I6202878427718bc825063941377c3e91b798677f with SHA-1 58c23a6832 is in history

Change-Id: I387cf117861370ec388777291e873f938b0a2b26