Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE