Merge "Revert fix for FingerprintManager leak" into oc-dev am: 807a8c6e7c
am: 23e33539cd

Change-Id: Iadbfa00e79d3607fe64186991f008a55ac5b05f3