Merge "Prevent the disabling of specified apps" into main am: 523c415c76 am: 77fed393d6

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

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