[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: 6b30dd66 am: 94eb350c -s ours am: 540dcd10 -s ours

am skip reason: Merged-In I83b3c2ccbe7cb38f71418afde4254f48153ab6b3 with SHA-1 b3199f4c is already in history

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



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