Merge "Refactor ANGLE usage code." into udc-dev am: b1e4e9fba5

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

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