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

Change-Id: If470f3434c3d351e586529becb4b717414d230c2