Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev