Merge "Pipe through attributeTag for one SMS permission check" into rvc-dev am: 21e4912edf

Change-Id: I04ab64cebc149202eab836e95135b0e3576a7044