Merge "Use public API Network#getNetId() to get netid" am: 0292235a96 am: 9943270a61

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0c5f289b4544ef7d51c28beab196536f0f812e9