Merge "Revert "Remove FingerprintManager API."" into main