Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc

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

Change-Id: I97222bb04bdea78178741245016658cad7f082dc