Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev am: 1308ffccf7

Change-Id: I4acb87ad99f25f0fed10f1c5dab9244713fd8fb6