Merge "Revert "Set a default ACL on /data/media/userId."" am: d9cf8590cb am: 42c41b5b47

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1555317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bf3ef0ce4d2c0fd5c50a84c3116949cf1c79893