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

Change-Id: Id58f0268fd6e5a3611b2dc27d456b13fb8dcee6a