HTCQualcommM7CDMARIL: enhance and error proof icccardobject.

Change-Id: Ibf23f7cf9d8c38a32414c4c727195fd0b38ca4c1
Revert "Revert "DCTracker: upgrade stubbed apn to Qcril Standard.""

This reverts commit aaf53c0f4cd42bcce3156409276933a120737195.

Change-Id: Ia567d376962d95fced83634ace52452cdaeafd8b
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2