Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev
am: c48f414a3c

Change-Id: Ic42d1b2c81a610708f1dce0b62e16e14adc956ef