Merge "[PasspointV2] Fix lint error" into qt-dev