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