Merge change I816428ae into eclair

* changes:
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number : 2177113