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

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

Change-Id: I0f3a59deea2a4b295762daf46d87f628be2752e8