Merge "Allow of expectAvailableCallbacks when validation state is unknown." am: e85110f35c

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

Change-Id: Id59b0e3a057b0bd199494fec1f72edd5f0ebe600