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

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

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