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

Change-Id: I2d5d6f564142878b13eed937289d0890a66ec065