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

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

Change-Id: I7096daeb9d45dcedbebf5c95b9c681c1e1c78935