[automerger skipped] [automerge] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 2p: 2447359037 am: ecee7cb098 -s ours am: 4ec2b1ec8f -s ours am: 95e4b3d44c -s ours am: 75e51b4ee5 -s ours am: 7f91eaf49f -s ours am: 7eadccba91 -s ours

am skip reason: subject contains skip directive

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

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