Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f37 am: ab3c6d56 am: d4a9230f am: 782535b6

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



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