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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52150c5e364580ea74f43f60dbf764ad9121874a