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

[automerger skipped] Merge "Fix avoidBadWifi behavior with IPv6 provisioning am: cc246e6c am: 483f9d6a am: 2ad202d3" into qt-qpr1-dev-plus-aosp am: c60cd04b
am: 357a9cc1 -s ours
am skip reason: change_id I18dc13083a7af4ed8bf95fbbf7dce0ecb9abaa14 with SHA1 01d68c56 is in history

Change-Id: I47967033b5405c75094d29244e17072009cca9dc