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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia32bb7804655629da639b0b0f705b7e590e9f82c