Merge "Revert "GraphicsEnvironment: Fix ANGLE system driver selection logic"" into udc-dev am: 6247a27d am: cef34c85 am: 2ae15c8d am: 61540897

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



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