[automerger skipped] Merge "Revert "Add 2 ANGLE deferlist settings"" am:...

[automerger skipped] Merge "Revert "Add 2 ANGLE deferlist settings"" am: 5594c74e am: 1942ca4c am: 1dedebd2 -s ours am: 14a34f75 -s ours am: 33f8cac8 -s ours am: 68a23aef -s ours

am skip reason: Merged-In I47f940612f8be0c83f0be04c2cc1af7908e37382 with SHA-1 ef6fa3f9 is already in history. Merged-In was found from reverted change.

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



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