Merge "Fix AuthenticationCallback leak in FingerprintManager" into oc-dev
am: a0cd8eb55d

Change-Id: If67639ed1f93f76a1ed225209869545572571484