Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: 49c50fb36b am: bc784d08fe

Change-Id: I2d1b88e5965848bfaf1f7e7d6008e6640a246176