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

Change-Id: Ia3abba983e00262bd3b71defb215e5d2f1fcadd4