Use a longer timeout on the disk encryption keys am: b3de337 am: 26335ed
am: 1cc3cc5

* commit '1cc3cc59f6d79b59064e1021975201f086fb356d':

Change-Id: Ide61c33fd6b4338e0d56fc03ca50c96e4bae4f59