Merge "Update UnlockMethodCache when screen turns off am: 08ae6643 am: 0550bddc" into oc-mr1-dev-plus-aosp am: e08d267e Change-Id: I559155ef56ec997e8de531004862a6b77449d641