[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: 25542a88 -s ours am: 59af5509 -s ours

am skip reason: subject contains skip directive

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



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