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 am: 382b1220

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



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