Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9

Bug: 136595429
Change-Id: I60bc87fac0070e6d3a749ae5fc8346d9f4f55da8
(cherry picked from commit 24b15eef74230945dffe721c19b96e071e4b95ff)
5 files changed