Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev
am: 71e0a3758f

Change-Id: I2841b973d012ea3d0b2c4162f3930e3d48cebad1