am e1ad3013: am 7d13215c: Merge "Include disabled accounts when cleaning up telephony accounts." into mnc-dev

* commit 'e1ad3013b443d68ec87e134094945a598bd39e03':
  Include disabled accounts when cleaning up telephony accounts.