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