Merge "Frameworks/base: Fix FingerprintManager JNI"