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

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

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



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