Merge "dumpstate: Add secure container + mounted filesystems to bugreport"