Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica55e1ae0cbda05a456add36e8fbcd6c866e63cb