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

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

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



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