Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am:...

Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe15 am: 23e3603e

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

Change-Id: Iea31095d21a01ef5847ae009331251f1e1df10a5