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

Change-Id: I433c563fc3fb0adadb4c12129c9bdac47913c434