[automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours am: e3a0261d66 -s ours am: b89e093149 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history
Change-Id: Ic2d7ef5a320f76a9e0da79783d96cab9a1b49e8d
This commit is contained in: