[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am:...

[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40 -s ours am: 4332b326 -s ours am: ac092ac0 -s ours am: a5904fed -s ours am: 322e0d68 -s ours am: 6800574d -s ours

am skip reason: subject contains skip directive

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



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