Merge "Remove SMS access for apps other than current SMS handler"