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

Change-Id: Ib0eae3c29ab1cbc912f93044b5bc4c072a17f054