am 6b58105c: am 75d042a4: (-s ours) am ef9b774c: am 0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS

* commit '6b58105c04abdfb2e8aa0f198b41c4c5a9f35d20':
  DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS