Merge "Ignore sharedUserId when package already left shared UID" into tm-dev am: bb2e8563

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



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