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

Change-Id: I8192adb6da215cb498e485bf4958fdb93c0bc517