Merge "Add FingerprintManagerCompat" into mnc-dev