[automerger skipped] Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46
am: 2ab25b8b96
-s ours
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 18e77f27aa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871682
Change-Id: I76dddb9ab8dd069752c6db977b79c658ad77b6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: