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

Change-Id: Icca30a44123b6da2cdf5b43458ee546dd031cf0f