[automerger skipped] Merge "Pipe through attributeTag for one SMS permission...
[automerger skipped] Merge "Pipe through attributeTag for one SMS permission check" am: 2f9f966e am: 349d932f -s ours
am skip reason: Change-Id I7388213c110738398a594c993f9cf6468ceed132 with SHA-1 65ebb4f6 is in history
Change-Id: I1c3abc7b388baf7d6419e4581e9b67e0deab638c