Use a longer timeout on the disk encryption keys
am: b3de337

* commit 'b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
  Use a longer timeout on the disk encryption keys

Change-Id: Ieadec9da13383361ac76bf6b79ecea948965a1d9