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

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



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