[automerger skipped] Merge "Clean up ANGLE integration logic." into main am: 376795891f am: c45e177eb9 am: 02ed0eea44 am: 003977d0b3 -s ours

am skip reason: Merged-In I2d398a36e0320b16de8664909ceb024089128aad with SHA-1 a6b1efb380 is already in history

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

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