am f29687ed: am 2c7ffe6b: (-s ours) am 1267abe1: am b117219a: am 46f1dd6d: am 19004c75: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS

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