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

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

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