Merge "Change ServiceState and TelephonyRegistry logging"