Merge "Skip Slot 2 in Radio VTS 1.0 in single sim mode" into stage-aosp-sc-ts-dev am: 33af950235 am: 928d92738a

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15857343

Change-Id: I0fdc7a4da21841976db3eb8b5376fa80127f3c40