Merge \\"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\\" into nyc-mr1-dev am: 9e73d82336
am: 933e5f9f87

Change-Id: I42509be5aaf59525014f09b4dad81dc4811d5b69