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

Change-Id: I5c4a3c1b011b6a0eeda8473b9206c4adf307c168