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

Change-Id: Ie6a8669fa5fdac4e3cc6f192e0090d1e4e057cab