Merge "[Mainline] Network netId to getNetId() migration" am: 7225913863 am: 983a2fe29b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1771c329d6b4c45f85d32cf44a7499efddcbfb