Merge "Prevent loop in PermissionPolicyService" into qt-dev am: 2c824e3a7a am: 3dbdc49334
am: 61bccc509c

Change-Id: I7c1d2c7c6354c5c321bc655fa480d6f74d5134bf