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

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