resolve merge conflicts of 345a396c to oc-dr1-dev

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

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 0dc274a,261f534..da46e88
--- 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,24 -122,6 +121,7 @@@ TEST_F(RadioHidlTest, sendEnvelopeWithS
      if (cardStatus.cardState == CardState::ABSENT) {
          ASSERT_TRUE(CheckGeneralError() ||
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
 +                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
                      radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
      }
- 
-     // 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 ||
-                     radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
-     }
  }