[automerger skipped] Merge "Make members final in TetheringService" am: 7e2180f019 am: 6636efb050 -s ours am: 41a5e3114a -s ours am: 8a92d0307c -s ours am: b9d655ace9 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history
Change-Id: I5031fffc1c7c7ee426fed0616e32cd5aceb269f9
This commit is contained in: