Merge "CDD: Require secure storage of lock screen credentials" into oc-mr1-dev