[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 am: 7945d755aa
am: 6a39d14d6d -s ours
am skip reason: subject contains skip directive
Change-Id: I9c2c4aa47b979afc965043d41a424c51fcbad681
This commit is contained in: