Add Enable WFC CarrierConfig option am: f1ea9bb77f am: ba9f9f9558
am: 5a54fc32ca

Change-Id: I8b2ea6660578d543df09660cf98f9bea6bdf129a