am dbf16c6f: am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI"

* commit 'dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f':
  Frameworks/base: Fix FingerprintManager JNI