Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev am: d8fdb26ebf
am: 9d9b5c22f1

Change-Id: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3