Merge "Revert "Add FingerprintManagerCompat"" into mnc-dev