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

Change-Id: Ia4f8c4c8762345bf65f890aba81d1111e654d37b