Merge "Use TelephonyManager instance specified with subscription id to get network operator name."
am: 64c865aaa5

Change-Id: I13a781d504eeb6892029529c706a6c4d5b7f30b8