[automerger skipped] Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d
am: bcefa0a8c4
am: 4529fbd9c8
-s ours
am skip reason: Merged-In I7f491151cc26dc10ccdb2900cfa81ff09c23b184 with SHA-1 aad20f216d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714
Change-Id: Ie75bd8b068ff08bdbf48c81bb260ddb98b320908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: