[automerger skipped] Merge "Unconditionally enable ANGLE developer option UI."...

[automerger skipped] Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f am: 8600c402 -s ours am: 65fa36ef -s ours

am skip reason: Merged-In I7f491151cc26dc10ccdb2900cfa81ff09c23b184 with SHA-1 8fc1391a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714



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