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

* commit '71dee5db1bcca6a437d7fa1325db0228aa34975b':
  Workaround legacy TelephonyManager.getDefault() with no context