Merge "Explicit init .rc user." am: f008ecffcb am: 944794e93c am: c6705ed7f7

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

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