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

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

Change-Id: Ib79ab6de90e735dca0928c7b3c6da7e8d6314df3