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

Change-Id: Iff0e595f62780d3e1b06f18375de76d5d918a570