Merge "Merge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev am: cbda08c5 am: 92234370"