Merge "Fix comparison bug in InCallServiceInfo"
am: 5ce1a7842d

Change-Id: I88b2174502e6917e54c176c014425e297dddec31