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

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

Change-Id: I1b1dcce340ff39a3eeb4359bad23510f3d2e7667