[automerger skipped] Merge "do not print phone number which is considered as pii" am: 84b311d3a2
am: 741e0f13f3 -s ours
am skip reason: change_id Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e with SHA1 720da9bff0 is in history

Change-Id: I1757509b476a45e7c9e7488a62b29fdc0d6a38dd