Merge "Don't throw in FullScore#policyNameOf." am: 644fe232cd

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

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