[automerger skipped] [automerge] FRP bypass defense in the settings app 2p:...

[automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d836 am: 1ebb665b -s ours am: fc17db49 -s ours am: ee39631c -s ours am: f70458cd -s ours

am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d90 is already in history

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



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