[automerger skipped] Merge "When data switches during voice call, make sure...

[automerger skipped] Merge "When data switches during voice call, make sure signal bar updates it." am: b6ae55b1 am: 5b25aba1 -s ours
am: d6484d11 -s ours
am skip reason: change_id I54fc4ca104cb451af847d7973fbffc7f0ed97c10 with SHA1 04be9d19 is in history

Change-Id: Iaf5692410c863503c3042194e5719b27609ead23