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

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

Change-Id: I2e55f0e6f3fbc0f64af398e1b07157bd1d7ef519