[automerger skipped] Merge "dumpstate: collect snapshotctl logs without root." into rvc-dev am: 76f7f29f68 am: 4c0eea8283 am: 3f9045ef08 am: db49889abb -s ours
am skip reason: Change-Id I83e394420225bd9543e013e8ed71b37850d07314 with SHA-1 d90cc65d74 is in history

Change-Id: I73b45fe0fc3c2a7f502522e2f58a66a630a11f1a