Merge change 6787

* changes:
  AbstractSyncableContentProvider must only call onAccountsChanged with GAIA accounts