Merge changes Ieefdc9d1,Id2dad12b

* changes:
  Move fingerprint package to sdk 26
  Update DeleteFingerprintDialogTest to sdk 26