[automerger skipped] FRP bypass defense in the settings app am: 22869d9019
-s ours am: 9764e1f9fd
-s ours am: 0f05806ab5
-s ours
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640995
Change-Id: Iba760e28f5d6dde8384873f171544772a5af2318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: