Merge "Check user states exist before package add/removal" am: 486816e3 am: aee53021

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8edda516d5bb60c11d332b741046c91f5a6a2797