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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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