Merge "Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1 am: 487621a791 am: 8f1b2f9035" into oc-dev
am: 85c04756e8

Change-Id: I6977c887f697de84742e3812a7642b025d033e70