[automerger skipped] Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1 am: aedcd7822c -s ours am: 66b9f546fb -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/+/1723146
Change-Id: Ifba70cab9285fe1beadce1bcafe26cd1558ba2aa
This commit is contained in: