Merge "Create a builder for NetworkCapabilities." am: b3289466c5

Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e