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

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

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