[automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 4e17751804 -s ours am: 9ad9d9bd9a -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 632092bb28 is in history
Change-Id: I1ab9d8f022fb7fab636fe7b03ead1d7d3f97aeef
This commit is contained in: