Merge \"Prevent shortcut access when user is locked\" into nyc-mr1-dev
am: 831dd7542f
Change-Id: I91a16fc26e261894db7ba4fa11772445f3c9fb0a
This commit is contained in:
am: 831dd7542f
Change-Id: I91a16fc26e261894db7ba4fa11772445f3c9fb0a