Merge "Add unit tests for AppIdPermissionPolicy" into main