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

Change-Id: I26c593410c01cc3e3a784abe8973af3057917fb6