Merge "Require sim-card-with-cert token for carrier api test." into nyc-dev
am: 234e9a28ee

Change-Id: I10a2bdc8f70d84c998b536196e8bdc314f82f395