Merge "Implement untetherAll as calls to stopTethering" am: 7fd48d54de
am: bce303a050

Change-Id: I2ef23434efd5730b9d482423ad046fdb502a4fd6