Merge "Merge "Prevent loop in PermissionPolicyService" into qt-dev am: 2c824e3a7a am: ef146c3716" into qt-r1-dev-plus-aosp