Merge "CDD: Require secure storage of lock screen credentials" into oc-mr1-dev am: 0ea6e466a7
am: 2d5a468ba4

Change-Id: I226a13f14442618bdf6601479332fcf9060b3a52