Merge "Add support for unknown Network to expectCallback" am: 7583caa837

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1974279

Change-Id: I612bce75778cac7211dd925cd835e70ab831c03b