Merge "Explicit init .rc user." am: 51ca5409 am: 1aa0a1b9 am: 4227c7c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2529140



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