Merge changes I3826b9ef,I91d68ca3

* changes:
  Add static for constant
  Get NetworkCapabilities from NetworkCallback
tree: 67e60384ae731ccf2b33664fa6d41043cb8fb264
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING