Merge "Move several config elements into TetheringConfiguration class"
am: 8d35276910

Change-Id: I0eb196a4b61e460db24271d6805177641ad3fc9b