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

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

Change-Id: I7ca6c1a999e5d59c72ee60d52561c3c9fa252169