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

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

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

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