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

Change-Id: Ib417427684e6e916fd517f6648eb74c573a0945b