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

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



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