[automerger skipped] Merge "dumpstate: collect snapshotctl logs without root."...

[automerger skipped] Merge "dumpstate: collect snapshotctl logs without root." into rvc-dev am: 76f7f29f am: 4c0eea82 am: 3f9045ef am: db49889a -s ours am: da71ee19 -s ours
am skip reason: Change-Id I83e394420225bd9543e013e8ed71b37850d07314 with SHA-1 d90cc65d is in history

Change-Id: I618e90e591022863bb51caef3136eac8e0d36b34