DO NOT MERGE: Add safety net to prevent sync stoppage

* Backport of Ie70df4d991f772069726b809d3bd51fbe06de728 from
  master; makes sure that security holds are updated when
  ExchangeService starts
* Partial backport of I55086899be9a2715cfbd3975e886781d8fc7080e
  from master; prevents erroneous security errors from non-
  account mailboxes

Bug: 4464610
Change-Id: Ic22c0942c5999f2e00dffbcdea8071592ec0d537
2 files changed