Merge "Revert "Disable a phone number log for user build" am: 46bc3fd5 am:...
Merge "Revert "Disable a phone number log for user build" am: 46bc3fd5 am: 64b7f379 am: 487621a7 am: 8f1b2f90" into oc-dev
am: 85c04756
Change-Id: I6977c887f697de84742e3812a7642b025d033e70