Merge "Revert "Fixed VTS failure in no SIM case"" into pi-dev
am: b471863b21

Change-Id: I14367daee252c6c4127b7fe202ccbdccbd04ff51