am 4b633a38: Merge "Externally-reported Moderate severity vulnerability in...
am 4b633a38: Merge "Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt" into mnc-dev
* commit '4b633a38':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt