Merge changes I0d0c0fac,Ifb9b00b6

* changes:
  Split updateCapabilities into two methods.
  More strictly check NetworkCapabilities callbacks.
tree: 8c9e21d7f35afe0f9e44b7e87e674159711b2142
  1. core/
  2. services/
  3. tests/