[automerger skipped] Merge "Create a builder for NetworkCapabilities." am: 9259da76fb am: aa3677342f -s ours am: 71700b6bdb -s ours am: 996f83d030 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 dfcbc07b3e is in history
Change-Id: I8f96e4066e1a78b7f60e3488ac73669a2c9bfb6e
This commit is contained in: