This reverts commit 65acbd0996. Reason for revert: DVT may be used by RoW carriers for test. Do not want to suddenly enable bootstrap for them and cause confusion. Bug: 343731008 Change-Id: I8419188d3a1d433c52f9ae4eb235afd3bc4d7935
65acbd0996