Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0 am: e245037327 am: 1ceb0fcf3a
am: cb3c7d3b0e

Change-Id: I009991aae750226f9596af2969428de85c6e4412