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

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

Change-Id: I143ce9f3786aab4912734fcee344446d6b33928b