[automerger skipped] Merge "[MultiUser] Ensure sysyuig activities use user 0" into tm-dev am: e5b570be am: 500315e8 am: aa14c631 -s ours am: 94086956 -s ours

am skip reason: Merged-In I1f1033dc875899567edd42a6fc67f9e6124fce73 with SHA-1 628fc532 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17824352



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