Merge "Prevent going through unnecessary networks" am: 836af202e0 am: 7039b0ca8a am: c65f31e0db am: 220980578f

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

Change-Id: I7211681be916abceacd2841548c8a118b1435f4c