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

Change-Id: I945ed8b1bd0c38423967c17d7c362a7aab4813a4