Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50

Change-Id: I148fcec861b97fbead0884918bff4e1560fab23d