[automerger skipped] Merge "Fix avoidBadWifi behavior with IPv6 provisioning...

[automerger skipped] Merge "Fix avoidBadWifi behavior with IPv6 provisioning am: cc246e6c am: 5fb25a3d" into qt-r1-dev-plus-aosp am: 3f43bf56 am: 0e09131f
am: 4231bb44 -s ours
am skip reason: change_id I18dc13083a7af4ed8bf95fbbf7dce0ecb9abaa14 with SHA1 01d68c56 is in history

Change-Id: Ib7c10b04f0b6399620461438fdf804ab53c6424d