Merge "Restructure use of absent tether_offload_disabled setting" am: 5bb30496cf am: c8b4ef85dc
am: d21ad47d43  -s ours

Change-Id: I0d755e5c6a8d89fe91706e1b06863d0fc660b245