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

Merge "Merge "Refactor ANGLE usage code." into udc-dev am: 8cd878fb" into udc-d1-dev am: 1a293f71

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



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