am 4869faf4: Revert "Move global sync settings to AccountSettings."

* commit '4869faf46559c54a34b969b5ae5391a208e723af':
  Revert "Move global sync settings to AccountSettings."