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