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

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

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