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

Change-Id: Iac2677ca21a0dfcbb3afa40a32d824977e3aaa7e