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: a0413849

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

Change-Id: Icddb3416a5f254d7235729487e88c45081d3f670