Merge "Revert "Revert "Revert "Set a default ACL on /data/media/userId.""""