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
am: c37d7a4756

Change-Id: Ia2b693f155e1d116f40e1a011abe3bdc70e8902c