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