Merge changes I475502fd,Ibf376a6f,Ia52f9caf

* changes:
  Address comments on aosp/1539753, aosp/1542487 and aosp/1547496.
  Fix propagating underlying caps when a network disconnects.
  Test for bugs with suspended VPN underlying networks.
tree: 2b0aed5f6043778f79c4f306b3972ed3655a6806
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS