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

Change-Id: If8ef48decc5414313663976534e11ddc6cac3ea1