[automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: a314315001 -s ours am: 4fc0376da3 -s ours am: 9f50308450 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 d8911baa45 is in history
Change-Id: I6943661de46008f5565887648fd63c9a4fd2819c
This commit is contained in: