Merge "Fix face education UX for both grid and traffic light" into sc-dev am: 147fa2f1 am: a8d6dba6 am: 640fc9a0

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

Change-Id: I422c6ef61d393df5a4649549c24f959f17ad644b