Merge "Add VPN name into the extra info of NetworkInfo" into main