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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c09a80a7dd55b357426e01b50725254a9c03148