Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Fix NPE in SyncReviewerManager

Change-Id: Iec42189b51505789cd55f63e68f6ebde327fa4b2

owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java

diff --git a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java
index bdfa7f6..3650e4f 100644
--- a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java
+++ b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java
@@ -141,7 +141,7 @@
 
         in.ignoreAutomaticAttentionSetRules = true;
         in.addToAttentionSet =
-            ownersForAttentionSet.get().addToAttentionSet(changeInfo, reviewersAccounts).stream()
+            reviewersAccounts.stream()
                 .map(
                     (reviewer) ->
                         new AttentionSetInput(