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