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

Change-Id: Ib27221f30e053ea25d67cbb15625e402a58f6eda