Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb

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

Change-Id: I0f4598c353cb7dba7f0583a3103481d298e45b5c