[automerger skipped] Merge "Request location info in UnderlyingNetworkListener" into sc-dev am: 52a1d139ae am: 42f98d8557 -s ours
am skip reason: Merged-In Id42ae2e373d909424c3f213412ea4731ee01fa2b with SHA-1 89e8793b3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187123
Change-Id: I2a168e7c7e8373e080723e78a7129eaf138e6128
This commit is contained in: