[automerger skipped] Merge "Request location info in UnderlyingNetworkListener" into sc-dev am: 52a1d139 -s ours

am skip reason: Merged-In Id42ae2e373d909424c3f213412ea4731ee01fa2b with SHA-1 89e8793b is already in history

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

Change-Id: I3335ae0489705a53f2edfc1fad14a428e61fecf5