[automerger skipped] Merge "Fix bug of permanently deleting SmsProvider rows doesn't work." am: 7e1b79ad7c
am: 5887b5ae81  -s ours

Change-Id: Idce0b817f69923088739d7f9e3c6224ef56997c8