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

Change-Id: I921974ede87a84c2421dda809baf61104cb6c1de