[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via...

[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6 am: b03fbe7f -s ours am: 5631164d -s ours am: b65b9dc6 -s ours

am skip reason: subject contains skip directive

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



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