Merge "Simplify FingerprintSettings" into mnc-dev