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

Change-Id: I6b72e669dfbf87909d8ec0795aa9321e7cf9787b