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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa4d3d86b603a2fe7b05d0d3e9de72c01b14eb34