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

Change-Id: Ie6d937b3a6a09e358945a5453af43b6096d8d9b6