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

Change-Id: I16343b82a5b2781c487258000d6b729b2f4bc328