Merge "Use 'gatewayConnectionName' for VcnGatewayConnection IDs." am: e13e0ee2ee am: 15a0354831 am: 816b3e7eda

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

Change-Id: I6a5e01306cde47e35c59b9c7a6d5044319a40721