Merge "FingerprintController: Make sure to reset the fingerprint mode when going to sleep" into oc-mr1-dev am: b140dc40d4
am: 837282ea25

Change-Id: I45d8f4fba4328571ce9e768c7f0163f1007a1e36