Merge "[SB Refactor] Add null checks around network capabilities." into...

Merge "[SB Refactor] Add null checks around network capabilities." into udc-dev am: 5be99642 am: d6f8fa97 am: 146b7950

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



Change-Id: I49d8b6938f7ef6187a9ea9749687f3e62546cbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>