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

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

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