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

Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f