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

Change-Id: I40ab3e008915786339b4fa9c6d0effe5655c97b6