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

Change-Id: I5b7a9ff0e7d85e5fdf3d8424fb8f3546636f3496