Merge "Explicit init .rc user." am: 6c8b6e16 am: 0b6dd2c6 am: e9eee2b5 am: 15e9b2f3

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



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