am 7f8e3409: Merge change I816428ae into eclair

Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-plus-aosp

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.