Merge "CDD: Changes to measure biometric unlock security." into oc-mr1-dev
am: 3a6ff29410

Change-Id: Icfeef51e12db5335f3238adc0fc62cc25153abd1