Merge "[automerger skipped] Merge "Request location info in UnderlyingNetworkListener" into sc-dev am: 52a1d139 am: 42f98d85 -s ours" into sc-v2-dev-plus-aosp am: 290a2743 -s ours

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

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

Change-Id: I52d5d683486c48f7cd668a9b07d470c9ffaa4c91