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

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

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