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

Change-Id: I9371f93d9bd2c935d8f83b351c2ffc7bd98d68dd