[automerger skipped] Merge "Make framework-tethering stubs use the new...
[automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: d03b443e am: 632747c7 -s ours am: b8420a16 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 c868e771 is in history
Change-Id: Ie16de83afa55c813acb191b3b77252eb60db7bd4