Merge "Change TetheringConstants class to final" am: 0c5f387efe am: fd2db9bf0a am: f699cd14f5

Change-Id: Ia107063b17a6a11cb0a000e6605ba9bab25c5a88