Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535 am: af9b507963 am: 62135157e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: I2818b5d9fc39e50316a7cf6cbd62cc4b9993db79