Merge "Ignore sharedUserId when package already left shared UID" into tm-dev...

Merge "Ignore sharedUserId when package already left shared UID" into tm-dev am: bb2e8563 am: 578aa3e8 am: 09d9aad1 am: 3613a96f

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



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