[automerger skipped] Merge "Signal the suspended state with...
[automerger skipped] Merge "Signal the suspended state with NetworkCapabilities" am: f6e15c79 am: 95a41c4e am: c1728cb0 -s ours
am skip reason: Change-Id If626d1ebcbec87a6131ec79f5882f4e6408f74e6 with SHA-1 0aba189c is in history
Change-Id: If06066090e1c4577bd8fc6447c25aab5f7c8fa45