Merge "Remove write permission from file mode of top-level user dirs" am: b35c5a08de am: 85d2820a92 am: 2a14b62f62

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2624725

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