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