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: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>