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 am: a102457e

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



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