Merge "Fix bug of permanently deleting SmsProvider rows doesn't work."
am: 7e1b79ad7c

Change-Id: If8679c9b32c8c9f8e7bb452d9cbb4cafe287b60f