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

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

Change-Id: Ide84627fb0e0f04edb7b9078fe3c6dc42bcd5202