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

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

Change-Id: I6721954b0c7b1676008f1f0205cd9c06a4109bd2