Merge "Change ServiceState and TelephonyRegistry logging" into qt-dev am: 519f45e222
am: f37eccd692

Change-Id: I151603b65a610e1a9486b2812ea4f9ca4ee3dde6