[automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e am: cf40067421 -s ours

am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: I25c87e69f2801df2301babb0b05931f717d9ed01