Fix GetOrCreateConversationActionTest failure
am: a019a9da5c

Change-Id: I3a4d26642c51f4eaaa393929c9c75f10801ffc68