Merge "dumpstate: collect snapshotctl logs without root." into rvc-dev am: 76f7f29f68

Change-Id: I000a45831918996919ee307e66c6e5e6aeb2dde5