[automerger skipped] Merge changes from topic "angle-developer-option-toggle1"...

[automerger skipped] Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a3 am: edc1304c -s ours am: d2b684f6 -s ours

am skip reason: Merged-In I2e63431cd0d8cf4712fc278646627fbf34a2b542 with SHA-1 34d30892 is already in history

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



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