resolve merge conflicts of 0e50326a to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I91fb2abbee5db431e8dc5dbfc8fc9fe0b9179b0c

diff --cc radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index eac35f7,29cb912..4790141
--- 1/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
--- 2/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@@ -823,15 -814,15 +814,15 @@@ TEST_F(RadioHidlTest, setIndicationFilt
   * Test IRadio.setSimCardPower() for the response returned.
   */
  TEST_F(RadioHidlTest, setSimCardPower) {
-   int serial = 1;
+     int serial = GetRandomSerialNumber();
  
-   radio->setSimCardPower(++serial, true);
-   EXPECT_EQ(std::cv_status::no_timeout, wait());
-   EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
-   EXPECT_EQ(serial, radioRsp->rspInfo.serial);
+     radio->setSimCardPower(serial, true);
+     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(radioRsp->rspInfo.error == RadioError::NONE
-         || radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
-   }
+     if (cardStatus.cardState == CardState::ABSENT) {
+         ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
+                     radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
+     }
 -}
 +}

diff --cc radio/1.0/vts/functional/radio_hidl_hal_utils.h
Simple merge