Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 357893095f am: 075f097e82

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93eb38109e4c72375fb591af0828dac3da1255c7