merge in klp-release (no-op)
Do not treat Settings failures as provisioning errors.

Bug: 11243543
Change-Id: I609b6d3d23882d0b308d37c06d393a49a25ff1a7
am 2e8ce13f: Do not treat Settings failures as provisioning errors.

* commit '2e8ce13ff0b47f2b0b2f06541a0c155e0727a40d':
  Do not treat Settings failures as provisioning errors.
Do not trigger full sync on push_only requests.

Bug: 11249423

Change-Id: I1285581bf9208b7ee222013d21e07eb9f8bb56e8
Opt out Exchange from restricted profiles.

Bug: 11271155
Change-Id: I29d07fcd31b36bec1efb9b124b6ff612c078c889
Merge "Do not trigger full sync on push_only requests." into jb-ub-mail-ur10
am 9e7c23ce: Merge "Do not trigger full sync on push_only requests." into jb-ub-mail-ur10

* commit '9e7c23ce16c410ee02c3f6cc934b73256eb00fd4':
  Do not trigger full sync on push_only requests.
Update sync time for search mailbox so we don't show the spinner forever

b/7538620

Change-Id: I3d7fb66ef90b995021cc1c13b17613022c5e46f3
Handle User Refresh in Edge Cases

Handle the following edge cases when a manual refresh is triggered:
* No connectivity
* Low storage space
* Timeout (sync not started)

Bug: 11241113
Change-Id: I7e8a415642e0a587070df641ca06a9922caa1621
Merge "Opt out Exchange from restricted profiles." into jb-ub-mail-ur10
am 6c3f8313: Merge "Opt out Exchange from restricted profiles." into jb-ub-mail-ur10

* commit '6c3f83133f35387381949145a4a313a168434c72':
  Opt out Exchange from restricted profiles.
Merge "Update sync time for search mailbox so we don't show the spinner forever" into jb-ub-mail-ur10
am e6664afa: Merge "Update sync time for search mailbox so we don\'t show the spinner forever" into jb-ub-mail-ur10

* commit 'e6664afadbfce709fc29be53d114008be0e017d3':
  Update sync time for search mailbox so we don't show the spinner forever
Merge "Handle User Refresh in Edge Cases" into jb-ub-mail-ur10
am d4726ae6: Merge "Handle User Refresh in Edge Cases" into jb-ub-mail-ur10

* commit 'd4726ae67e40e56d0b88b82e1ba2f3694a455430':
  Handle User Refresh in Edge Cases
Handle all possible exits of the PingTask.

- If we get an exception, reschedule the ping instead of just dying.
- If the task was cancelled, also reschedule.

Bug: 11249423
Change-Id: I74a39e04de73659d58f1c53b238f8a40f15d6849
Merge "Handle all possible exits of the PingTask." into jb-ub-mail-ur10
am 67e17e9c: Merge "Handle all possible exits of the PingTask." into jb-ub-mail-ur10

* commit '67e17e9c8c58abcd8a2f0e211c64441e59d66b87':
  Handle all possible exits of the PingTask.
Do not reuse old connections.

- Only keep connections in the cache for a limited time
  (currently 10 minutes).
- Always get connection manager from the cache, don't keep
  a reference in the EasServerConnection.

Also add some logging.

Bug: 11249423
Change-Id: I7c7da95745770fd2cb3ba58d63fc1fcdcc8eb232
am dc15b97b: Do not reuse old connections.

* commit 'dc15b97b8975b994992d14d2cf3e6c8a80645b5d':
  Do not reuse old connections.