Dialer: Scrub debug logging for identifiable information.

Change-Id: I2b45ec7c37a7f69c972feb3dde1eac87306259f6
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	src/com/android/dialer/lookup/ContactBuilder.java
	src/com/android/dialer/lookup/openstreetmap/OpenStreetMapForwardLookup.java

Change-Id: I303c04ff6d52af8aa1a5ba2a6829d0df88467921