Merge "Do not use SLog in telephony modules"
am: 203d9d6dea

Change-Id: I398d36e594d3380f66ea272282a99dac1d58b398