Merge "Allowing for null net caps in updateConfiguration" am: e1c9ad9459

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

Change-Id: Ia888ca151e9151e3f9bf2042662828ac9a0f295e