Merge "Use 'gatewayConnectionName' for VcnGatewayConnection IDs." am: e13e0ee2ee

Original change: https://android-review.googlesource.com/c/platform/cts/+/1653488

Change-Id: Id96c5d98eca965bbdeb5c750e2cb86c4a0b423cf