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

Change-Id: Ib1bfe7ac92e2ab6607180bd4ecc0ecaf8ab90186