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

Change-Id: I4447f929e1fe511bc0f1d4fd67f113e1f2d621b6