[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: b34ff2f2 -s ours am: c923d29c -s ours am: e57ce41b -s ours am: d9b063c4 -s ours am: 8c9e74c6 -s ours am: 8ab6eb1b -s ours am: ff41a2c1 -s ours am: 9c43d60f -s ours

am skip reason: subject contains skip directive

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



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