Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b804f am: 78ab60db84

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

Change-Id: Ic324c6829d8dfa180ca7e0aaf5d8841c0e76dd88