Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev