Merge "Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check." into jb-dev