Revert "Revert "TRDS:[ContactsCommon] Dark Contacts (2/2)""

This reverts commit 13cb48a78cad87eed3652ea2b0d80c14784ffc45.
Revert "Revert "trds: fix dark contacts for sw600dp devices (2/2)""

This reverts commit b9c84fc76e14eb487f128d38146c146c9301af0a.