Fix GetOrCreateConversationActionTest failure am: a019a9da5c
am: 3616fb5b3e

Change-Id: Iab4b669f556cec46db72678c2b61624c0418996b