[automerger skipped] Merge "FRP bypass defense in the settings app" into...

[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c4 -s ours am: eeafd49d -s ours am: ecf18466 -s ours am: 999bc0b0 -s ours am: f035fc45 -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: Ia97177c5f42fbb9ba72fe3ee2d4659545b46c242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>