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: f11acea915

Change-Id: I3cb97b4e58b04cc916e3c959b7b829881a0417c0