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

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

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