[automerger skipped] Merge "Make NetworkCapabilities authoritative for suspended state" am: 445186aa82 am: a256726fcc am: 2cd8d1fcb3 -s ours
am skip reason: Change-Id I4808fcc0047a926b23ed3d49d979bb7b0371dc69 with SHA-1 45d4f10c42 is in history

Change-Id: I3d295d63541ea01d0c5087021a8a214e09239be0
tree: af9b1a7eb46794a20613f0f22fd090e28ed77a53
  1. core/
  2. services/
  3. tests/