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

Change-Id: I5d978a3228d2d38250831b5a23f6b44338a44784