Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds." am: a355552bfe am: cc9acb51c5
am: 2e8b22cdbf

Change-Id: I3c2dd44ac20685951617889f0b9ad785d8046685