[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-v2-dev am: cf31cd7d -s ours am: 7720f2f1 -s ours am: 1e13559d -s ours

am skip reason: subject contains skip directive

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



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