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

Change-Id: I4aff94c775906924ab667bf5fa345e8a2ca38d2a