Merge "Pipe through attributeTag for one SMS permission check" am: 2a9c3e49ba

Change-Id: Icb2e48499fac6caea8bbbce0805d4ce6ffe6ed79