Merge "Explicit init .rc user." am: f0578771ea am: f90cb6315d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2530202

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