Merge "Fix up NetworkSecurityConfigTests." into main am: 950306478a

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

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