Merge "Ensure restricted number CDMA call waiting info is passed to Telecom." into oc-mr1-dev
am: d51a9e4989

Change-Id: Ieb7109376d572a5077002b49e6655770c4eac23e