Merge "Merge "Revert "GraphicsEnvironment: Fix ANGLE system driver selection logic"" into udc-dev am: 6247a27d am: b2d200fb am: 5ee87a61" into udc-qpr-dev-plus-aosp am: cd8402fb

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



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