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

Change-Id: Iaee7efa94600caf50231116dcfbb98e0b0bb69b9