Merge "FileSystemPermissionTest: add /data/logger"