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

Change-Id: I01448af6940670e3fbc99878f60d0141f7fd8082