Merge "When data switches during voice call, make sure signal bar updates it."
am: b6ae55b169

Change-Id: I74484d5f2cecd5fd5c3b5e5592fdd90778bcf925