[automerger skipped] Merge "Match any user pkgs for headless sys user mode"...

[automerger skipped] Merge "Match any user pkgs for headless sys user mode" into tm-qpr-dev am: 15d0b581 am: 16ac359c -s ours

am skip reason: Merged-In I3e225047846658479d00d4089b8864860ef0c274 with SHA-1 19eb2d59 is already in history

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



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