Merge "Change SMS security check to enforceCallingPermission()." into jb-dev