Merge "Explicitly invoke keyguard for visibility test" into oc-dev am: c1f7fd18f9 am: d532946b04
am: 988afef0b5

Change-Id: Ie0f0e4d42ebd8d60a3c38561d51fcf9842db0ba6