[automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 83eb86b247 -s ours am: 9442426f95 -s ours am: d6a7bb02f4 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 38c6519a90 is in history
Change-Id: I6943661de46008f5565887648fd63c9a4fd2819c
This commit is contained in: