[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc am: 6748a5655a am: 2d40a7c450 -s ours
am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 9a2db307ba is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651
Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1
This commit is contained in: