Merge "DO NOT MERGE: This test verifies security vulnerability in SMS: Apps can bypass the SMS short code notification prompt" into lollipop-mr1-cts-dev