[automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 -s ours am: 25e390141b -s ours
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 e5c66bd083 is in history
Change-Id: Iaa7de3faab9b866c81d2007cacc926b311c6214c
This commit is contained in: