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

Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2