Merge "Make APN re-connect delay configuable" into honeycomb-LTE