Merge branch 'master' into implement_android_checkin_delegate

src/controller/CHIPDeviceController.cpp

@@ -1983,7 +1983,7 @@ void DeviceCommissioner::ParseCommissioningInfo()
     // return.
     auto attributeCache = std::move(mAttributeCache);
 
-    if (mPairingDelegate != nullptr)
+    if (mPairingDelegate != nullptr && err == CHIP_NO_ERROR)
     {
         mPairingDelegate->OnReadCommissioningInfo(info);
     }