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

Change-Id: Ib46ce4c0e12a313f3b376634a85ae1050d655c34