[automerger skipped] Merge "Pipe through attributeTag for one SMS permission...
[automerger skipped] Merge "Pipe through attributeTag for one SMS permission check" am: 2a9c3e49 am: 06213e21 -s ours
am skip reason: Change-Id I346ac2d3acad0e0d18b298f89f0b96324fc52333 with SHA-1 83083305 is in history
Change-Id: I023aa25c93ff085fc6871dfcd4a8cd830be25f89