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

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

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



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