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

Change-Id: I7da85befb8acacc8ee3839fed4f7138c911a3e29