[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev am: cf31cd7d00 -s ours am: 7720f2f16d -s ours am: 25542a8817 -s ours am: f0fdd18c5a -s ours am: 23a304990a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061284 Change-Id: I1097432b926b25d88a4bb524ad37a2797f7d22b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: