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

Change-Id: I7c386065179e8eae8dff0cfbf5227eb259dbb9b9