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

Change-Id: I8a704df37020bbc11a3fe1074053621002184e62