Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5
am: c1acc768f6

Change-Id: I6dcdf216d98de94cdd72a15c130b89ef38a9b58f