Merge "Change ServiceState and TelephonyRegistry logging" am: 7aa9020feb
am: cb779131e5

Change-Id: Icef555d851df6ee9015e5ac5169388ac07526404