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

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

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