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

Change-Id: Icd96de516d5b9512e6f26c7f66f4be7579eb8212