[automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
am: 1ebb665b71
-s ours am: fc17db496f
-s ours am: ee39631cdb
-s ours am: f70458cdd9
-s ours am: 84a63ef6ce
-s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I1ae9b4782c717b6d66b30e79b00f1e17f8b1d0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: