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

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

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