Merge "Explicit init .rc user." am: f008ecff am: 944794e9 am: c6705ed7 am: a25a02cd

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



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