Merge "Fix face education UX for both grid and traffic light" into sc-dev am: 147fa2f1 am: d50fe51f am: 7b3919c3

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

Change-Id: Ia4d00b2efc5f50338928756349f563d234143913