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: 71af36bb
Change-Id: Idd31cf5bb3d989865ff77decdddecd0850f6792f