Merge "Explicit init .rc user." am: e7d8f94d am: 69dca29b am: 1958f4e6 am: a8408156

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



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