Do not grant already granted permission

This is esp. necessary as we want to avoid to grant already grated
system-fixed permissions.

Fixes: 129354118
Test: Upgraded from P->Q
Change-Id: Ifc8271e77a94545f995160402fd83867c404bb54