Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off"...

Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01

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



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