Merge "Merge "Explicitly invoke keyguard for visibility test" into oc-dev am: c1f7fd18f9 am: 7697cca580" into oc-dr1-dev-plus-aosp