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

Merge "Refactor ANGLE usage code." into udc-dev am: b1e4e9fb am: cf72dfe4 am: 718e456b am: 970204dc

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



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