Merge "Add getAvoidBadWifi system API" am: 58582a36fc
am: 656f2fa71a

Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184