Merge "FileSystemPermissionTest: Add /data/img"