[automerger skipped] Merge "Make members final in TetheringService" am:...
[automerger skipped] Merge "Make members final in TetheringService" am: 5d36f018 am: bc2e0f99 -s ours am: 62a728fa -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 071c3abf is in history
Change-Id: I90080b06374765008d228e7dcd54c9e3dc62e4ce