am 7510cab2: am 4b2698ba: Merge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev

* commit '7510cab2b6910c546441ed4ef12093367053bcf0':
  Workaround legacy TelephonyManager.getDefault() with no context