Merge "Explicit init .rc user." am: e7d8f94d48 am: 69dca29baf

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

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