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

Change-Id: I12c3b3e3a0d4ad4919df5daeb07367f6197ffa93