[automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours

am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ie16de83afa55c813acb191b3b77252eb60db7bd4
tree: 51554ec194abae52475d22a2a3a994fb0795259d
  1. Tethering/