Merge "Merge "Make framework-tethering stubs use the new defaults" into...
Merge "Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: f4ca25a3 am: 59118d19" into rvc-d1-dev-plus-aosp am: 7fe9a035 am: 27772df3
Change-Id: Iff61b53d4d85530d93a7d85e06b0b9a5c7cd27cf