tree 9b58745e6d372034536d599161064bf3616ec788
parent 4e5cb18d53825deb851f974b6d061c34051fa1ea
parent 6b4e794ccd1459e63293af55a0a4fcf84bab51b7
author Bryan Ferris <bferris@google.com> 1561772346 -0700
committer android-build-merger <android-build-merger@google.com> 1561772346 -0700

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834
am: 6b4e794ccd

Change-Id: If4663fd9f5ed8980090d55602cffb0e5f2054b16