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

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



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