Merge "Fix logical error in testGetDppEnrolleeResponderModeSupport" into sc-dev