Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d am: 54d7271920

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

Change-Id: I95ee7a46dc41e412a7f7370fff95d758373e1d14