Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318 am: c711d1c39a

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

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