Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev am: a22156f4 am: 59f972ae am: 9e98853f

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



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