Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e

Change-Id: I12fa7bbf4df7fbd070ece2e6a48ebc5a16c9973f