Merge "When the sharedUserSetting of the application on /system is different...

Merge "When the sharedUserSetting of the application on /system is different from the sharedUserSetting on /data, we should trust the sharedUserSetting on /system" am: b51e99de am: a1dd9bec

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



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