[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am:...

[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce am: b2551d4c am: 2d96bac3 -s ours am: 16897d63 -s ours

am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 f6008978 is already in history

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

Change-Id: Ia66f851af83f562565faa33cb3fef18ed5bf6e32