Merge "Disable a phone number log for user build"
am: 59a40691a5

Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646