Merge "Pipe through attributeTag for one self-permission check" am: da2bb52a7f am: cab55a0d08 am: 12ae057e98 am: 458b0de861 am: bf1a6652d1

Bug: 136595429
Change-Id: I0e4db0685b37e249d7dae45cfd443ee4f3cbe1c2
(cherry picked from commit 2eb6f29acf3050a00419cb5b870a5b2fc9234ac1)
1 file changed