Merge "Change ServiceState and TelephonyRegistry logging" am: 801bd64a00
am: 663c389c81

Change-Id: I282f97fb6d2537c4d3aea819239182cf27a9500d