Merge "Detect invalid Call Forwarding numbers and replace" into oc-mr1-dev am: 112e5ada3c
am: c0d2d58913

Change-Id: I3b7db71677fe32cb7a5208569122d16ff01af8ce