Rebase the code with new changes and resolve the issues

Author: smanes0213

Tests/L2Tests/tests/HdmiCecSink_L2Test.cpp

@@ -469,7 +469,7 @@ HdmiCecSink_L2Test::HdmiCecSink_L2Test()
                 return port == 1 ? true : false;
             }));
 
-    ON_CALL(*p_hdmiInputImplMock, getHDMIARCPortId(::testing::_))
+    EXPECT_CALL(*p_hdmiInputImplMock, getHDMIARCPortId(::testing::_))
         .WillByDefault(::testing::Invoke(
             [](int& portId) {
                 portId = 1;
@@ -656,7 +656,7 @@ HdmiCecSink_L2Test_STANDBY::HdmiCecSink_L2Test_STANDBY()
                 return port == 1 ? true : false;
             }));
 
-    ON_CALL(*p_hdmiInputImplMock, getHDMIARCPortId(::testing::_))
+    EXPECT_CALL(*p_hdmiInputImplMock, getHDMIARCPortId(::testing::_))
         .WillByDefault(::testing::Invoke(
             [](int& portId) {
                 portId = 1;