[automerger skipped] Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev am: 1308ffccf7 am: ad4458c2bd -s ours
am skip reason: Change-Id I44c80a08e541503c1f910c4410fbcce3dd05a24e with SHA-1 1e713c1eab is in history

Change-Id: I66cfb67dfdb89310dbf6ef2d2e62a43905578a4f