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