Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc am: 6748a5655a

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

Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925