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

Change-Id: I6a6bc4b2679432dd539d6b6930d7a32229fab363