Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev

* changes:
  Update fingerprint/face enrollment to lock icon
  Update fingerprint intro drawable
  Remove SUW-specific fingerprint enroll description