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

Change-Id: Ic459905b4cc18b011ac874e1be926d75f88fa714