Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1771c329d6b4c45f85d32cf44a7499efddcbfb
tree: daaaa88dffaf13f97ff3654674173a1fce5c510d
  1. core/
  2. services/
  3. tests/