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

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

Change-Id: I22328129aaf6c992aaf62c662670abe444cb3cc5