Merge "[pm] fix sharedUserSetting during reconcile" into udc-dev am: 37d419b7 am: 95611af3

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



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