am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair

Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp

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