Merge "Add a tethering offload settings kill switch" am: 7cf3086f37
am: 503a6952b2

Change-Id: I6be567bb315a5797bbc71f5f48efc522b947f678