Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev am: 7c18f52452
am: 5c0982c604

Change-Id: Ib075510a7e3f7ad5fe17f7dea065f1dd42328d16