Merge "Merge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev am: cbda08c5ec am: 9223437066"