Revert "Continue to show '4G' for LTE networks on toro."

This reverts commit 121cb24f93bd42c68cadd20b8e14e2ef10b95a5e.

Change-Id: I224d9ab349de3f878c1b34cf0cbe7b608d6355b7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD