Merge "Ensure package context used by System UI has a valid userId." into sc-qpr1-dev am: e7f5a37501 am: 75891d4d17

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

Change-Id: I8b8da358d8599bd03db27fb33281552ae51cadac