Merge "Remove SimChangeListener from Tethering"