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

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

Change-Id: Ic09b161eeff7203c9516b3fc803df6b8deacd010