Merge "Update VpnTest#testDefault to check other uid blocked status" into main