Merge "Keep the conversation shortcut criteria in People Service consistent...
Merge "Keep the conversation shortcut criteria in People Service consistent with the one in Notification Manager" into rvc-dev am: 068558b4 am: cc197c06 am: 1ca5df43 am: 07224ec8
Change-Id: I75c412f94d1137801b978317729f97fdb99f970d