Merge "Refactor ANGLE usage code." into udc-dev am: b1e4e9fb am: 0c4dfca2

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



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