[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: 32dd7f465d am: 2c04e5abb9 am: 3a6c0f2117 -s ours

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

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

Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1