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
am: 8aa8342ee0

Change-Id: Id2a6f65eaffd27f99f41cdacb428b0c81b63be33