Merge "Revert "Add 2 ANGLE deferlist settings"" into udc-dev am: b7a23d62 am: 0aefdd5f

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



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