Merge "Ensure package context used by System UI has a valid userId." into...

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

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

Change-Id: If491fe543ae209f3b4b797881d2fde66a58a2d44