Merge "Fix comparison bug in InCallServiceInfo" am: 5ce1a7842d am: 10197de5a4
am: d4ee3bef3e

Change-Id: I41527be5e199ead758d26595d45b91e0d5882d32