[automerger skipped] Merge "Test for unexpected prefix updates in...
[automerger skipped] Merge "Test for unexpected prefix updates in SetAndClearNat64Prefix." into rvc-dev am: d5de13da -s ours
am skip reason: Change-Id Ic86f93161293b4ad5366fd9cab2e26d4a6f636c4 with SHA-1 61f796b5 is in history
Change-Id: Ia82d4b329602d5b7d2fec2d6f5ecea4e7fef9490