Merge "Include disabled accounts when cleaning up telephony accounts." into mnc-dev