Merge "Clean up ANGLE on system assumption." into main am: 342f922472

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2995540

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