Merge "PackageSetting now owns its PackageUserState" into sc-dev am: edb6d7f8a8

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

Change-Id: I48962a009619f279dd06a2b8dd7b0610c1a5b691