Merge "Update UnlockMethodCache when screen turns off am: 08ae664365 am: 0550bddc95" into oc-mr1-dev-plus-aosp
am: e08d267eec

Change-Id: I559155ef56ec997e8de531004862a6b77449d641