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

Change-Id: I2e135e5df483b3a7583dcf0e73cfe085e9953314