Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c
am: 518c9798eb

Change-Id: I773eb76c12d3c3adf1860cc17c1b09ed56b77e2d