Merge "Add support for Telecom logging to obfuscate string phone numbers." am: ae941732bb am: bfd852a7bb
am: 600db05fb1

Change-Id: If249e9ac6f579856de3e3790eb2844ca93c7e5d2