Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf003 am: cf400674 am: b323c61b Change-Id: I665db1aa3e6382780414fe502e36ecf047852fac