am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1

* commit '1800ccfa647cca6e9c051759312d6af12f134f5a':
  Disable wimax when mobile data is in Settings