Merge "Make auto-upstream the default tethering behaviour"
am: e193298c4a

Change-Id: Ie160bb6422f7a8f218dbf1374fdfadb0b957150d