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

Merge "Revert "Add 2 ANGLE deferlist settings"" into udc-dev am: b7a23d62 am: 836abff3 am: d8209bbc am: 43647896

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



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