[automerger skipped] Merge "[Cherry-pick] Removes ANGLE as an intervention."...

[automerger skipped] Merge "[Cherry-pick] Removes ANGLE as an intervention." into main am: 9ac03040 am: cec1caa9 am: 67acc257 -s ours

am skip reason: Merged-In I9fca1eab03f5804f52e09fb51e08a806b0fc9972 with SHA-1 c9702e05 is already in history

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



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