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

Change-Id: I8959dcabc62799cd5d042c7d89d06cbe0651879b