Merge "Remove SimChangeListener from Tethering" am: 6e35b2c596 am: fbab182f44
am: cd70c87c65

Change-Id: I57f979caab4aaf4e9f6481b27995a49e44ba31d9