Add Enable WFC CarrierConfig option am: f1ea9bb77f
am: ba9f9f9558

Change-Id: Ie0dbe77d54e4da112d1f0c306531f9458d8b7c45