[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: 05d884470a am: b560e885f7 am: a93cae0ec7 -s ours

am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 8a74c1ff1d is already in history

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

Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1
tree: 728e4613dd37ca988412fece30a5ea54c4b259b1
  1. core/
  2. services/