Merge "Remove usage of hidden .netId in IpConnectivityLog" am: 36b467616c am: 9f8f5a4041

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cc807b2b5c1083f70e8d1dd3f74d0a7954de4c7