[automerger skipped] FRP bypass defense in the settings app am: 22869d90 -s...

[automerger skipped] FRP bypass defense in the settings app am: 22869d90 -s ours am: 9764e1f9 -s ours am: 0f05806a -s ours am: 5fd32e90 -s ours am: 5623c078 -s ours

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

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



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