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: 6791ba8c am: 5e1d20db am: deaafc29

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



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