[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9 am: 2d96bac3aa -s ours

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

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

Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1