[automerger skipped] Merge "Allow per-app opt in to use system ANGLE." into...

[automerger skipped] Merge "Allow per-app opt in to use system ANGLE." into main am: dfc69539 am: 58e0e142 -s ours am: a266fe84 -s ours

am skip reason: Merged-In I2c9d4e1747796d2b0ae58c4456b781b9940fbb26 with SHA-1 9b8ec2f0 is already in history

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



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