[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17 -s ours am: b8fd8890 -s ours am: d48037d6 -s ours

am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a is already in history

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



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