Merge "Set media folder +F for adopted storage as well" am: 739ca2c298 am: 19adff5f27

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

Change-Id: I855399600230f5a27d8058ec7fee0df9b2d22f22