Merge "Refactor ANGLE usage code." into udc-dev am: 8cd878fb am: 66212e0d am: 4e5ac7e4

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



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