[automerger skipped] Merge "Make NetworkCapabilities authoritative for suspended state" am: 5f604cad6d am: 8fd385ddba am: 4cfa9dbd8c -s ours
am skip reason: Change-Id I4808fcc0047a926b23ed3d49d979bb7b0371dc69 with SHA-1 52638ac414 is in history

Change-Id: I3d295d63541ea01d0c5087021a8a214e09239be0