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