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

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

Change-Id: I83649ebb75c370b12209b9808535a2c873fa6fd1