Merge "Add getters to UnderlyingNetworkInfo" am: 05d884470a am: b560e885f7

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

Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925
tree: ee8a4ce63ee508961273b9a9e2949d32f096429d
  1. core/
  2. services/