b/12824882: fix canified Permissions condition map
Merge pull request #957 from reciprocity/hotfix/permission-conditions-map-fix

b/12824882: fix canified Permissions condition map
Merge remote-tracking branch 'origin/release/0.9a21' into develop