Merge "Remove write permission from file mode of top-level user dirs" am: c73150307a am: 55593258ac am: 0f7c1825b1

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

Change-Id: Idda5d816c2a012afa35658f1b2d86ae2787c1faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>