[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 qt-dev am: 4727dadd am: 806167ed -s ours am: 886fab19 -s ours am: 3d7a421a -s ours am: 52111570 -s ours am: adfa1235 -s ours am: e3353ec3 -s ours am: a3b35a9b -s ours

am skip reason: subject contains skip directive

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



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