Merge "Clean up ANGLE integration logic." into main am: 376795891f am: c45e177eb9 am: 02ed0eea44

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

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