[automerger skipped] Merge "Use doIpv6Provisioning in testPref64Option." am:...

[automerger skipped] Merge "Use doIpv6Provisioning in testPref64Option." am: b6db57bb am: b0dd46c4 -s ours am: 39fe6248 -s ours am: 88f46830 -s ours

am skip reason: Change-Id Iaa3e297e2417d4cdf9393baf27d61657e5743888 with SHA-1 a8a73c53 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1341035

Change-Id: I137defafd4b2a58b0150b40caf7dc8b2554b1a4f