tree 7a7b3b59b30b0912bc9181f9baeb3c2110237d35
parent 7daaaad74a29eca0e2a56b29fe55e2f615b05415
parent 4c0878bf747c2c377666763cec85fa82b23cb706
author akirilov <akirilov@google.com> 1536188319 -0700
committer android-build-merger <android-build-merger@google.com> 1536188319 -0700

[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab am: 47a4d99c0c am: 15682d0bd4
am: 4c0878bf74  -s ours

Change-Id: I74154c7729eeb50816aaa288b9eedac914359dff