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

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

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



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