Contacts: Go TRDS 2.0

use propper configuration values now

Change-Id: I80453416b8fae1eb064bf6098bb239d422e7ae61

Conflicts:
	src/com/android/contacts/activities/ShowOrCreateActivity.java
Merge "Contacts: Go TRDS 2.0" into jb-mr1