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

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

Change-Id: I46a19b92781b6e3c209ff419f35e12bcda5678d4