Add Enable WFC CarrierConfig option
am: f1ea9bb77f

Change-Id: Ibbac02de511cb805e92328243ca9c83fc5c23963