Merge "Revert "Set a default ACL on /data/media/userId."" am: 6836a8bda7 am: ca97626e08

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7124285f41c6a854ad5c86677bc94d78ddca5a97