Merge changes I5989a67e,I30a77bd6 into sc-dev

* changes:
  Announce UDPFS enrollment percentage
  Update UDFPS fingerprint enrollment