Merge "CDD: Clarify secure lock screen requirements." into nyc-dev am: 2d320342e8
am: 3d9320f0db

Change-Id: I23ee1e3a3119a5771a8302cce4c5a0e9faa04869