[automerger skipped] Merge "Clean up ANGLE on system build configuration."...

[automerger skipped] Merge "Clean up ANGLE on system build configuration." into main am: 7bbfeb14 am: 4ae8b9f1 -s ours

am skip reason: Merged-In Ie8294b6494e2fad44ff102ecf0018916d61b082a with SHA-1 ee964d23 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2994810



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