Merge "Match any user pkgs for headless sys user mode" into tm-qpr-dev am: 15d0b581

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



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