Merge "Change TetheringConstants class to final" am: 2f92c8d46c

Change-Id: I3446ad5a368b9f127066ba1e133a7191afe80c2b