[automerger skipped] [NS07] Add the rest of the scoring policy am: f3ff362210 am: 789b9b4ae3 -s ours am: 7e5405ce00 -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/+/1723143
Change-Id: I0b682200692bd5a68aa5f1f4475a34a863046304
This commit is contained in: