Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am:...
Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: f4ca25a3 am: 2e87a144 am: 6bc5fbbc am: 9390578d
Change-Id: I431a3e98fae07388ef06123f18b27e11045115e4