Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev
am: 56760c65df

* commit '56760c65df6ca55d4570847b9f9777a23e2dfaf5':
  Add carrier config key for carrier setup app.

Change-Id: Ie6ab4cd355c061a7c6f04228fefde2ebf690eb59