Merge "Remove MANAGE_WIFI_AUTO_JOIN" into tm-dev