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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9a1e4f225064585448ee66c58a7afb9095ee7e4