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

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



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