Merge "Fix CtsCarrierApiTestCases to support DSDS device." am: 5843a6d299
am: fa8f253704

Change-Id: I6aa38e013bfa801ef5846a5d2928500ba5e00431