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

Change-Id: I98c072e48cf5d8adb6e0305153cac82b0a4077fc