[automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours am: 3ec724b979 -s ours am: eb7fbdd42c -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history
Change-Id: Iec9c771adfcec5dcc5c95d701d69ab338e83b16f
This commit is contained in: