Merge "Revert "GraphicsEnvironment: Fix ANGLE system driver selection logic"" into udc-dev am: 6247a27d am: cef34c85 am: 672cc5f5 am: 181514ac

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



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