[automerger skipped] Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev am: 83eb86b247 am: a7068abb33 -s ours am: 6daf05c882 -s ours
am skip reason: Change-Id I3803fa3d9806848b331c35ee8bac256934bd1f21 with SHA-1 c9016cafe3 is in history
Change-Id: Ie776e2aa8db68f217e1efaa4ac3069c36b8c201c
This commit is contained in: