Fix GetOrCreateConversationActionTest failure am: a019a9da5c am: 3616fb5b3e
am: b95a19ca46

Change-Id: I9292b64d99bafecb52479acfb9877dc6cb4dd0eb