Merge "ImsStateTracker: fix ImsStateCallback call on the same SIM card"