[automerger skipped] Merge "Fix file paths for DumpstateUtil calls in 1.0" into rvc-dev am: 3b491b4812 -s ours

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

Change-Id: I70c47dd7ebd63950611fb0a17437d92c4cb12b84