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