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

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

Change-Id: Ibb41f5d50b446c9718f3a3b9b862b5b158988876