am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1

* commit '33fe4a36b7d1ef84b13447f2a765db465ef96e56':
  Fix TelephonyManager to grab the best context