[automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours

am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: I5b57ee16e81765981fb4154aa27c1be4ecb85d02
tree: 3af8b9675b2011e5a16cafc9d0d4131762b4eeaa
  1. Tethering/