Merge "Disable a phone number log for user build" am: 18f843be39 am: 2092b19393
am: 74595d6091

Change-Id: I2c6466e3ae4d4d80805b4d479263baaeb271cf4c