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

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

Change-Id: I1b1dcce340ff39a3eeb4359bad23510f3d2e7667