Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev am: 26887dc880
am: 444af99af6

Change-Id: Ie3a8bfbcb88190aba2402a43e86bafafcc51aae1