[automerger skipped] Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb am: 9575dbbb81 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726731
Change-Id: I93d9de97236854622f8d9d8b19cd4a76d338d860
This commit is contained in: