Merge "Use framework-tethering-stub instead of framework-tethering" am: 3e4ab5c2b5

Change-Id: I2caaa5f804a510bcc18822b784c129e9b058ea03