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

* commit 'aae781f32bc769f6275d3cfc200cbbadf3f820f6':
  Add auto-restore timeout for secondary networks.
tree: a08020fd4626a76290346811137238583be0cda8
  1. core/
  2. services/