Merge "Fix inconsistent use of screenlock" into nyc-dev

This commit is contained in:
Kenny Guy
2016-02-17 21:51:53 +00:00
committed by Android (Google) Code Review