[automerger skipped] Revert "Fixed VTS failure in no SIM case" am: 9d0f0635b9 am: 185e46a234
am: f631be1c2b  -s ours

Change-Id: I43e0657079c99a0db348233cbf6a41deb2705b3d