[automerger skipped] [DO NOT MERGE] Fix build breakage caused by change in PermissionsChecker am: 733c064a0b
am: 1938edd831 -s ours
am skip reason: subject contains skip directive

Change-Id: I2822df7fd64c10c784ad9cc958440640f625840c