Merge "Make members final in TetheringService" am: 5d36f01873

Change-Id: I64e0d2512a31310948cdd106943d9f7345209fb7