[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev
am: b2964b2956 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd5eb4109d1eca28aee7004b0625f51b1c9d203b