Merge "Move TetheringConfiguration out to its own file" am: 5a45170f95  -s ours am: fc97509a3e
am: 42bd98f1ce

Change-Id: I3580c86b3d252209dfa84c9beb4c42403609b267