am f945b0ce: am 5352d400: Merge "FileSystemPermissionTest: Eliminate tests...
am f945b0ce: am 5352d400: Merge "FileSystemPermissionTest: Eliminate tests which access /proc/1/mounts"
* commit 'f945b0ce':
FileSystemPermissionTest: Eliminate tests which access /proc/1/mounts