Merge "Skip Slot 2 in Radio VTS 1.0 in single sim mode" into stage-aosp-sc-ts-dev am: 33af9502 am: 928d9273 am: 92b7f302 am: 7a7e4a56 am: 5e702854

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

Change-Id: I9a3aaf7c3de7564146873457a05e057a46502139