[automerger skipped] Merge "Use the correct object to guard |mConversationsListeners|" into udc-dev am: 02c4e4e0 am: 8479a587 -s ours

am skip reason: Merged-In I383e6c42f16f747dd80d604671b369fa491376cb with SHA-1 cae843c3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22440501



Change-Id: I97794c82813935c29c96203f8e639f0bef0900c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>