Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA...
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8.
am: b57e6560
Change-Id: Idaafcb7c835aa7b7b83bb7382900ef3d18fa551f