Merge "[Cherry-pick] Removes ANGLE as an intervention." into main am: 9ac0304079

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

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