Combine successive PermPolicySvc syncs
am: 78c155b8a4

Change-Id: I36cbd7b9cce412b26f6ebdf58ddc8ff337f09b95