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