Merge "Fix updated privileged app with shared UID loses privileged permission...

Merge "Fix updated privileged app with shared UID loses privileged permission when request in manifest." into sc-dev am: 55799d74

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e2c799922ed3173456192504de778c147cea0e6