[automerger skipped] Merge "Create a builder for NetworkCapabilities." am: c6ab1a994f am: f6e84adc67 -s ours am: dd6e10106c -s ours am: f6e811bfd7 -s ours am: 3c973748dd -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 e5e385020c is in history
Change-Id: Iec9c771adfcec5dcc5c95d701d69ab338e83b16f
This commit is contained in: