Merge "[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 am: b03fbe7f51 -s ours am: 5631164db9 -s ours am: b65b9dc604 -s ours am: 2999070287 -s ours am: d57db4f0b7 -s ours" into tm-qpr-dev-plus-aosp am: c3e143e681 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I2af0322cc3087b06c10646638cae52e6a5ea36b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: