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

Change-Id: If4cf11820b0d712584e7ee393c26c7c359d7952f