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: Ic301e0f1ba7614a4b7de86d84f1dd7277c3259dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>