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

Change-Id: Iae49c001986cb0e4ee6887f249d0f9eb2ab1225f