[automerger skipped] [NS09] Implement the new ranking code am: e4aeac6d75 am: 9134beb0e0 -s ours am: 21c6c1d96e -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/+/1723145
Change-Id: Ie2def0acf1b9f7efa31c33e5f9353f85728927ba
This commit is contained in: