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

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