[automerger skipped] Merge "Set media folder +F for adopted storage as well" am: 739ca2c298 am: 19adff5f27 am: e2fefec3bb -s ours

am skip reason: Change-Id I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8 with SHA-1 083221f5cf is in history

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

Change-Id: Iee4294f9e16c934cfc99daed87fd9ad7b678fe56