Merge "Merge "Allow profiles of an admin user to remove system app updates."...

Merge "Merge "Allow profiles of an admin user to remove system app updates." into tm-dev am: 86445022 am: 372cc2bf" into tm-d1-dev-plus-aosp am: 7fc492df

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



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