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

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

Change-Id: If9fbc7d78b9dbb7d2e2a33057e85c8dbb9ee968e