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

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

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