Merge "When data switches during voice call, make sure signal bar updates it." into qt-dev am: 566f3521cd
am: 0713dc0738

Change-Id: I4e898b001ca523996340fd756843358a31add67b