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

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

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



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