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

Change-Id: Id4175c6e6b39c33e2debf9bbca448a3993ceb04a