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

Change-Id: I3ca1652cfd23ad3f94991c21e5072d4082cc20c8