Merge \"Add carrier config for WFC promo mode.\" into nyc-mr1-dev
am: 3cc6935719

Change-Id: Ib135da9b8869da3396a98262f5e18f09ffbbad3e