Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev
am: 26887dc880
Change-Id: If086b75dd28b0838cd576469eb4ad05deea01d50
This commit is contained in:
am: 26887dc880
Change-Id: If086b75dd28b0838cd576469eb4ad05deea01d50