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

Change-Id: Iffb5890236dadc93f66ef397ecbfbd084bd6d473