Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am:...

Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev am: ca61c391 am: 85dcbd54

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

Change-Id: I9303e3d4d330ab0e4e18f3fd280a64ff98753eca