resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia06246656aa4ef9db0b68942402ea0264fb92b17
Merged-In: I9200fb932032e6e23a5f4401fa5698140a278d07

diff --cc radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
Simple merge

diff --cc radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
index 9e51df43ec2be2f392ff5f1e8f224539b1f94bd6,670bafd8aca2d3b921611395833a5faefecfcc98..f97f5febd6ee4e9b4d90173f49f1679b2ffbf071
--- 1/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
@@@ -37,27 -37,8 +37,9 @@@ TEST_F(RadioHidlTest, sendEnvelope) 
          std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 -                    radioRsp->rspInfo.error == RadioError::NONE);
 +                    radioRsp->rspInfo.error == RadioError::NONE ||
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
      }
- 
-     // Test with sending random string
-     serial = GetRandomSerialNumber();
-     content = "0";
- 
-     radio->sendEnvelope(serial, content);
- 
-     EXPECT_EQ(std::cv_status::no_timeout, wait());
-     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
-     EXPECT_EQ(serial, radioRsp->rspInfo.serial);
- 
-     if (cardStatus.cardState == CardState::ABSENT) {
-         std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
-         ASSERT_TRUE(CheckGeneralError() ||
-                     radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
-                     radioRsp->rspInfo.error == RadioError::NONE ||
-                     radioRsp->rspInfo.error == RadioError::MODEM_ERR);
-     }
  }
  
  /*
@@@ -156,22 -122,6 +121,6 @@@ TEST_F(RadioHidlTest, sendEnvelopeWithS
      if (cardStatus.cardState == CardState::ABSENT) {
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 -                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);
      }
- 
-     // Test with sending random string
-     serial = GetRandomSerialNumber();
-     contents = "0";
- 
-     radio->sendEnvelopeWithStatus(serial, contents);
- 
-     EXPECT_EQ(std::cv_status::no_timeout, wait());
-     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
-     EXPECT_EQ(serial, radioRsp->rspInfo.serial);
- 
-     if (cardStatus.cardState == CardState::ABSENT) {
-         ASSERT_TRUE(CheckGeneralError() ||
-                     radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
-                     radioRsp->rspInfo.error == RadioError::MODEM_ERR);
-     }
  }