Merge "Allowing for null net caps in updateConfiguration" am: adec6f861f am: 834e5611bc am: 7ff0565c1b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2008515

Change-Id: I7ca6c1a999e5d59c72ee60d52561c3c9fa252169
tree: 4a1d9e8e4255b22e1c41c49977815af4ca8f2408
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/