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

Change-Id: I3b705dec21aaff8024b30a3b5dcb409135eeba71