am 47df0d33: resolved conflicts for merge of 98bcc322 to ics-mr1

* commit '47df0d33':
  DO NOT MERGE Update CTS Version to 2.3_r10
  Add SKT/KT rule into CtsTelephonyTestCases and use MCC+MNC code to distinguish SKT or KT carriers.
  Fix AudioRecordTest to skip setUp() and tearDown() when MIC is not available.
  fix IPv6 loopback pattern
  Update the list UNSUPPORT_DATA_SMS_MESSAGES
  Adjust the value of individualStartTimeoutMs to be consistent with the value of testStatusTimeoutMs.
  Revert "Changed CTS runner to work with emulator"
  Disable CTS Verifier BT Connection Access Tests
  Fix Test Blacklist Mistake for HC MR2
  Update CTS Verifier Version to 3.1 R2
  Update CTS Version to 3.1 R5