Merge "p2p: fix vts fail due to 5g go init fail with 00 country code" into qt-dev