[automerger skipped] Fixed VTS failure in no SIM case am: ac4e6051f9
am: e79895b34f  -s ours

Change-Id: Ie9af524db8e86fcfb419592acac4384f16975768