[automerger skipped] Merge "Prevent the disabling of specified apps" into main...

[automerger skipped] Merge "Prevent the disabling of specified apps" into main am: d06d6aff am: fd725081 -s ours

am skip reason: Merged-In I0b298af76cec20e4f31ec7411bbf3200a2869035 with SHA-1 03bde3d8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2774892



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