Merge "Stop exposing constructor of TetheringConstants" am: 5dd58dac7e am: f2472fa7aa

Change-Id: Ib1f70ab634af2e1a8f3e5c1332f6e5f656fd6275