Merge "Add Vivante exceptions for FileSystemPermissionTest"