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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c09a80a7dd55b357426e01b50725254a9c03148
tree: 6b13d1497b828de9999c753174ddf421c1c4e1f1
  1. core/
  2. services/
  3. tests/