[automerger skipped] Merge "include system ANGLE usage as ANGLE usage" into...

[automerger skipped] Merge "include system ANGLE usage as ANGLE usage" into main am: 5f66ad6c am: 2ccc7c7d am: c10c372f -s ours

am skip reason: Merged-In I9beb7c75d65b7aa2b7c5af9f262f30be9d6247d5 with SHA-1 b794d9bb is already in history

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



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