Merge "Use the correct object to guard |mConversationsListeners|" into udc-dev

services/people/java/com/android/server/people/data/DataManager.java

@@ -1339,7 +1339,7 @@ public class DataManager {
     /** Adds {@code listener} to be notified on conversation changes. */
     public void addConversationsListener(
             @NonNull PeopleService.ConversationsListener listener) {
-        synchronized (mConversationsListeners) {
+        synchronized (mLock) {
             mConversationsListeners.add(Objects.requireNonNull(listener));
         }
     }